From 8a7d0ab4813457088335685e956313afbd1d65a1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 27 Sep 2016 15:12:47 -0400 Subject: [PATCH] Make gtk_init_with_args behave as documented This docs say it should return FALSE if the display can't be opened, but it was failing. https://bugzilla.gnome.org/show_bug.cgi?id=771959 --- gtk/gtkmain.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index ad6ed506a4..5c0dcb1884 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -963,14 +963,14 @@ gtk_init_with_args (gint *argc, gboolean retval; if (gtk_initialized) - return GDK_PRIVATE_CALL (gdk_display_open_default) () != NULL; + goto done; gettext_initialization (); if (!check_setugid ()) return FALSE; - gtk_group = gtk_get_option_group (TRUE); + gtk_group = gtk_get_option_group (FALSE); context = g_option_context_new (parameter_string); g_option_context_add_group (context, gtk_group); @@ -982,7 +982,11 @@ gtk_init_with_args (gint *argc, g_option_context_free (context); - return retval; + if (!retval) + return FALSE; + +done: + return GDK_PRIVATE_CALL (gdk_display_open_default) () != NULL; } -- 2.30.2